Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebase/element ios 1.9.17 #744

Merged
merged 463 commits into from
Feb 14, 2023
Merged

Rebase/element ios 1.9.17 #744

merged 463 commits into from
Feb 14, 2023

Conversation

NicolasBuquet
Copy link
Contributor

Pull Request Checklist

  • I read the contributing guide
  • UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
  • Accessibility has been taken into account.
  • Pull request is based on the develop branch
  • Pull request contains a changelog file in ./changelog.d
  • You've made a self review of your PR
  • Pull request includes screenshots or videos of UI changes
  • Pull request includes a sign off

dodog and others added 30 commits January 10, 2023 09:54
@dodog @weblate
Translated using Weblate (Slovak)
0c5e899 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
@weblate
Translated using Weblate (German)
4e2a49f 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
@szimszon @weblate
Translated using Weblate (Hungarian)
e8e9945 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
@ujdhesa @weblate
Translated using Weblate (Albanian)
15666ac 
Currently translated at 99.6% (2340 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
@weblate
Translated using Weblate (Italian)
244a9b5 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
@weblate
Translated using Weblate (Portuguese (Brazil))
d83a667 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pt_BR/
@Linerly @weblate
Translated using Weblate (Indonesian)
9babf49 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
@alexvamp @weblate
Translated using Weblate (Russian)
830483d 
Currently translated at 81.7% (1920 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ru/
@yostyle @weblate
Translated using Weblate (Albanian)
4544e4f 
Currently translated at 99.6% (2340 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
@yostyle @weblate
Translated using Weblate (Dutch)
5637792 
Currently translated at 98.3% (2310 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/nl/
@yostyle @weblate
Translated using Weblate (German)
ddac8ef 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
@yostyle @weblate
Translated using Weblate (Hungarian)
fb125b7 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
@ujdhesa @weblate
Translated using Weblate (Albanian)
7cc7300 
Currently translated at 99.6% (2340 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
@yostyle @weblate
Translated using Weblate (Italian)
a6de4ff 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/it/
@yostyle @weblate
Translated using Weblate (Portuguese (Brazil))
ada6c33 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/pt_BR/
@yostyle @weblate
Translated using Weblate (Ukrainian)
0b71610 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
@yostyle @weblate
Translated using Weblate (Estonian)
1a9e530 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/
@yostyle @weblate
Translated using Weblate (Indonesian)
540afd9 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
@yostyle @weblate
Translated using Weblate (Slovak)
8c7f309 
Currently translated at 100.0% (2348 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
@ujdhesa @weblate
Translated using Weblate (Albanian)
5a8cad8 
Currently translated at 99.6% (2340 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sq/
@jaller94 @weblate
Translated using Weblate (Esperanto)
8eca09d 
Currently translated at 63.8% (1500 of 2348 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/eo/
@weblate
Translated using Weblate (German)
fa96d1e 
Currently translated at 99.9% (2350 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
@szimszon @weblate
Translated using Weblate (Hungarian)
71fcc22 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/hu/
@IhorHordiichuk @weblate
Translated using Weblate (Ukrainian)
966fa31 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
@weblate
Translated using Weblate (Estonian)
d46db7c 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/et/
@Linerly @weblate
Translated using Weblate (Indonesian)
814c92b 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/id/
@dodog @weblate
Translated using Weblate (Slovak)
0479829 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/sk/
@weblate
Translated using Weblate (German)
d7722df 
Currently translated at 100.0% (50 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/de/
@Linerly @weblate
Translated using Weblate (Indonesian)
68d70df 
Currently translated at 100.0% (50 of 50 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/id/
@pixlwave
Merge pull request #7248 from RiotTranslateBot/weblate-riot-ios-riot-ios
8a26808 
Translations update from Weblate
pixlwave and others added 17 commits January 24, 2023 12:39
@pixlwave
version++
5bb8f22
@pixlwave
Merge pull request #7296 from vector-im/release/1.9.16/release
ef009fd 
Release 1.9.16
@pixlwave
finish version++
c0b819f
@pixlwave
Merge branch 'release/1.9.16/master'
ae87624
@nimau
Fix a deadlock when updating the summary of a room that has a voice b…
9fcebb2 
…roadcast
@nimau
Add Towncrier file.
06c572e
@nimau
Merge pull request #7300 from vector-im/nimau/hotfix_deadlock_update_…
f3b4c09 
…room_summary

Fix a deadlock when updating the summary of a room that has a voice broadcast
@Anderas
Ensure E2EE never tracks UnknownError
3e286d1
@pixlwave
Fix avatar loading in SwiftUI.
4f61755
@Anderas
Merge pull request #7304 from vector-im/andy/tracking_changes
0e0f9e8 
Ensure E2EE never tracks UnknownError
@pixlwave
Merge pull request #7306 from vector-im/doug/space-switcher
487347a 
Fix Space Switcher avatars
@pixlwave
version++
99891f3
@pixlwave
Merge pull request #7307 from vector-im/release/1.9.17/release
68d8386 
Release 1.9.17
@pixlwave
finish version++
a5ae619
@pixlwave
Merge branch 'release/1.9.17/master'
8bc7134
Merge vector-im/element-ios v1.9.17 into element-rebase
1b2bc64
Resolve conflicts on Merge Element v1.9.17 into Tchap
03bc5e4
@NicolasBuquet NicolasBuquet self-assigned this Feb 8, 2023
@NicolasBuquet
Copy link
Contributor Author

I added static var pollsHistoryEnabled: Bool = false in multiple BuildSettings.swift files for it to be available to each target in Tchap. I'm not sure it is the correct way to fix this.
I had to make MXRoom.lastVoiceBroadcastStateEvent() method public (and not internal by default) because it is used in VoiceBroadcastAggregator class and TestTchap was failing on that.

yostyle
yostyle reviewed Feb 10, 2023
View reviewed changes
@NicolasBuquet NicolasBuquet force-pushed the rebase/element-ios-1.9.17 branch from 0310cf2 to a6b03dd Compare February 14, 2023 13:03
@yostyle
Copy link
Contributor

yostyle commented Feb 14, 2023 •
edited
Loading

I added static var pollsHistoryEnabled: Bool = false in multiple BuildSettings.swift files for it to be available to each target in Tchap. I'm not sure it is the correct way to fix this.

LGTM

I had to make MXRoom.lastVoiceBroadcastStateEvent() method public (and not internal by default) because it is used in VoiceBroadcastAggregator class and TestTchap was failing on that.

IMO this change is not necessary. Both classes are in the same module.

yostyle
yostyle approved these changes Feb 14, 2023
View reviewed changes
Copy link
Contributor

@yostyle yostyle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM

@NicolasBuquet NicolasBuquet merged commit 5c984ee into develop Feb 14, 2023
@NicolasBuquet NicolasBuquet deleted the rebase/element-ios-1.9.17 branch February 14, 2023 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yostyle yostyle yostyle approved these changes

Assignees

@NicolasBuquet NicolasBuquet

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.